tb_cms 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec75c53b2b39e4b6fe5a0e7968c1f54a695403b4
-  data.tar.gz: 79126403fdfc7cdc63e65ac01e14a883570eeb06
+  metadata.gz: 71c7f1ff25083a54d690e16a3ddd75126bc67cbc
+  data.tar.gz: f6c6451194dbd039b601e24676951249c08530a0
 SHA512:
-  metadata.gz: e79dba5b06e5998468ea5d1d4ec15a0bde3173563770a9a2b1eb1759eac376f0fac84489ddf7840f0e19c3e54d38725a80bd0ff9ec80d419ae4565479a42a1d3
-  data.tar.gz: 934771b2dd67cffad7f93b80d6a6edd3a93cd56754a78a05178618683b5eb0239971ada653436f82c196d100e2edac7498948f80c6f604f697c3d1f38d5354c6
+  metadata.gz: 586998011f575c2f7943e91df9c37372db0e4c8cf499104a1b0d5088cd4ec22ed45607b5403d2cb014609cfdb464109f19e3469320aac350877b6b602272b3c0
+  data.tar.gz: 8e837878a843444b59001314982a60f046f984961675629f1af7ea4dd414c898317cc00038636a8ec60029178b6224065cefda0f8035b3af9d94c34e4a9ed8fd

data/README.md

@@ -72,12 +72,6 @@ Create a controller concern at `app/controllers/concerns/spud_cms_layout_actions
 
 If you ran the `spud:cms:layout` generator described earlier, the concern and empty action would have been created for you automatically.
 
-## Using Liquid Templates
-
-Pages use the [liquid](https://github.com/Shopify/liquid) template syntax engine created by Shopify. This allows you to easily inject variables into your pages in the page editor. Example:
-
-    <h2>{{page.name}}</h2>
-
 ## Using Menus
 
 A lot of cms engines allow you to render your navigation links in a ul block by using your page tree structure. In a lot of cases this is insufficient as some sites have urls that redirect to pages outside of your cms. This is where menus come in. They can be built in the admin control panel.
@@ -105,6 +99,3 @@ TB CMS uses RSpec for testing. Get the tests running with a few short commands:
         rspec spec
 
 After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
-
-
-

data/app/assets/javascripts/admin/cms/menu_items.js

@@ -3,7 +3,7 @@ spud.admin.cms.menu_items = {};
 (function() {
   var menu_items = spud.admin.cms.menu_items;
   var val;
-  
+
   var setUrl = function(){
     return '/admin/menus/'+ val +'/menu_items/update_sort';
   };
@@ -35,25 +35,31 @@ spud.admin.cms.menu_items = {};
         });
         val = $("#menu-id").val();
         //Update order of menuItems
-        $.ajax(setUrl(), { 
-          method: 'PUT', 
+        $.ajax(setUrl(), {
+          method: 'PUT',
           data: {
             order: sortArr
-          }, 
+          },
           dataType: "json",
           success: function(data, status, jqXHR) {
             menu_items.updateStatus(200, '0px 0px 26px 2px rgba(4, 252, -49, 0.59)');
           },
           error: function(XMLHttpRequest, textStatus, errorThrown) {
             menu_items.updateStatus(100, '0px 0px 26px 2px rgba(255, 0, 40, 0.59)');
-            alert("Status: " + textStatus); alert("Error: " + errorThrown); 
-          }       
+            alert("Status: " + textStatus); alert("Error: " + errorThrown);
+          }
         });
       }
     });
   };
 
   menu_items.init = function() {
+    return
+
+    // Sortable relies on jQuery UI, which has been removed
+    // This code needs to migrate to sortable.js
+    // See: https://bitbucket.org/moser-inc/tb_core/commits/e6252b6aa508e103b54df7e563ecfa2d2ec26c24
+    //
     $("#sort tbody").sortable({
       helper: fixHelper,
       cursor: "move",

data/app/controllers/cms/sitemaps_controller.rb

@@ -1,4 +1,4 @@
-class Cms::SitemapsController < Spud::ApplicationController
+class Cms::SitemapsController < TbCore::ApplicationController
   respond_to :xml
   def show
     @pages = SpudPage.published_pages.viewable.order(:spud_page_id)

data/app/helpers/cms/application_helper.rb

@@ -85,8 +85,8 @@ module Cms::ApplicationHelper
       menu_id = menu.id
     end
 
-    cache(['sp_list_menu', menu, options]) do
-      link_options = options[:link_options] if options.key?(:link_options)
+    Rails.cache.fetch(['sp_list_menu', menu, options]) do
+      link_options = options[:link_options] if options.has_key?(:link_options)
 
       start_menu_item = options[:start_menu_item_id] if options.key?(:start_menu_item_id)
       content = if options.key?(:id)
@@ -136,8 +136,8 @@ module Cms::ApplicationHelper
 
       content += '</ul>'
 
-      concat content.html_safe
-    end
+      content
+    end.html_safe
   end
 
   def sp_menu_with_seperator(options = {})

data/app/models/spud_page.rb

@@ -22,11 +22,12 @@ class SpudPage < ActiveRecord::Base
   scope :viewable, -> { where(visibility: 0) }
 
   def full_content_processed
+    ActiveSupport::Deprecation.warn('#full_content_processed is deprecated; use #full_content instead.')
     spud_page_partials.collect(&:content_processed).join(' ')
   end
 
-  def to_liquid
-    return { 'name' => name, 'url_name' => url_name }
+  def full_content
+    spud_page_partials.collect(&:content).join(' ')
   end
 
   # Returns an array of pages in order of heirarchy
@@ -43,7 +44,7 @@ class SpudPage < ActiveRecord::Base
       if filter.blank? || c.id != filter.id
         list << [Array.new(level) { '- ' }.join('') + c.name, c[value]]
         list += options_tree_for_page(collection: collection, parent_id: c.id, level: level + 1, filter: filter)
-       end
+      end
     end
     return list
   end

data/app/models/spud_page_partial.rb

@@ -1,10 +1,8 @@
 class SpudPagePartial < ActiveRecord::Base
   belongs_to :spud_page, touch: true
-  has_many :spud_liquid_tags, as: :attachment, dependent: :destroy
   validates :name, presence: true
   before_save :maintain_revisions
   before_save :update_symbol_name
-  acts_as_tb_liquid_content
 
   def update_symbol_name
     self.symbol_name = name.parameterize.underscore
@@ -14,24 +12,9 @@ class SpudPagePartial < ActiveRecord::Base
     return @symbol_name || name.parameterize.underscore
   end
 
-  def postprocess_content
-    @_template = Liquid::Template.parse(content)
-    self.content_processed = @_template.render('page' => spud_page)
-  end
-
-  def content_processed=(content)
-    self[:content_processed] = content
-  end
-
   def content_processed
-    if self[:content_processed].blank?
-      if new_record?
-        self.content_processed = postprocess_content()
-      else
-        update_column(:content_processed, postprocess_content)
-      end
-    end
-    return self[:content_processed]
+    ActiveSupport::Deprecation.warn('#content_processed is deprecated; use #content instead.')
+    content
   end
 
   def maintain_revisions
@@ -44,7 +27,7 @@ class SpudPagePartial < ActiveRecord::Base
         revision_bye = SpudPagePartialRevision.where(spud_page_id: spud_page_id, name: name).order('created_at ASC').first
         revision_bye.destroy unless revision_bye.blank?
       end
-      end
+    end
     return true
   end
 end

data/app/models/spud_snippet.rb

@@ -4,11 +4,8 @@ class SpudSnippet < ActiveRecord::Base
   validates :name, presence: true
   validates :name, uniqueness: true
 
-  acts_as_tb_liquid_content
-
   def postprocess_content
-    template = Liquid::Template.parse(content)
-    self.content_processed = template.render()
+    content
   end
 
   def content_processed=(content)

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

@@ -17,12 +17,12 @@
 <% @page.spud_page_partials.each do |page_partial| %>
 	<% if(page_partial.name.match(/^body$/i) && Spud::Cms.yield_body_as_content_block == false) %>
 		<% cache(page_partial) do %>
-			<%= page_partial.content_processed.html_safe %>
+			<%= page_partial.content.html_safe %>
 		<% end %>
 	<% else%>
 		<%= content_for page_partial.symbol_name.to_sym do %>
 			<% cache(page_partial) do %>
-				<%= page_partial.content_processed.html_safe %>
+				<%= page_partial.content.html_safe %>
 			<% end %>
 		<% end %>
 	<% end %>

data/db/migrate/20120101192412_create_spud_pages.rb

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

data/db/migrate/20120101193138_create_spud_menus.rb

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

data/db/migrate/20120101193255_create_spud_menu_items.rb

@@ -1,4 +1,4 @@
-class CreateSpudMenuItems < ActiveRecord::Migration
+class CreateSpudMenuItems < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_menu_items do |t|
       t.string :parent_type

data/db/migrate/20120101194124_create_spud_templates.rb

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

data/db/migrate/20120103034659_create_spud_page_partials.rb

@@ -1,4 +1,4 @@
-class CreateSpudPagePartials < ActiveRecord::Migration
+class CreateSpudPagePartials < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_page_partials do |t|
       t.integer :spud_page_id

data/db/migrate/20120104194032_add_visibility_to_spud_pages.rb

@@ -1,4 +1,4 @@
-class AddVisibilityToSpudPages < ActiveRecord::Migration
+class AddVisibilityToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :visibility, :integer,:default => 0
     add_column :spud_pages, :published, :boolean,:default => true

data/db/migrate/20120107181337_add_menu_name_to_spud_menu_items.rb

@@ -1,4 +1,4 @@
-class AddMenuNameToSpudMenuItems < ActiveRecord::Migration
+class AddMenuNameToSpudMenuItems < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_menu_items, :name, :string
   end

data/db/migrate/20120111134754_add_use_custom_url_name_to_spud_pages.rb

@@ -1,4 +1,4 @@
-class AddUseCustomUrlNameToSpudPages < ActiveRecord::Migration
+class AddUseCustomUrlNameToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :use_custom_url_name, :boolean,:default => false
   end

data/db/migrate/20120118141852_add_notes_to_spud_pages.rb

@@ -1,4 +1,4 @@
-class AddNotesToSpudPages < ActiveRecord::Migration
+class AddNotesToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :notes, :text
   end

data/db/migrate/20120126232428_add_menu_id_to_spud_menu_items.rb

@@ -1,4 +1,4 @@
-class AddMenuIdToSpudMenuItems < ActiveRecord::Migration
+class AddMenuIdToSpudMenuItems < ActiveRecord::Migration[4.2]
 
   def change
     add_column :spud_menu_items, :spud_menu_id, :integer

data/db/migrate/20120128163601_add_classes_to_spud_menu_items.rb

@@ -1,4 +1,4 @@
-class AddClassesToSpudMenuItems < ActiveRecord::Migration
+class AddClassesToSpudMenuItems < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_menu_items, :classes, :string
 

data/db/migrate/20120329132314_add_site_id_to_spud_pages.rb

@@ -1,4 +1,4 @@
-class AddSiteIdToSpudPages < ActiveRecord::Migration
+class AddSiteIdToSpudPages < ActiveRecord::Migration[4.2]
   def change
   	add_column :spud_pages, :site_id, :integer
     add_index :spud_pages,:site_id

data/db/migrate/20120329132322_add_site_id_to_spud_templates.rb

@@ -1,4 +1,4 @@
-class AddSiteIdToSpudTemplates < ActiveRecord::Migration
+class AddSiteIdToSpudTemplates < ActiveRecord::Migration[4.2]
   def change
   	add_column :spud_templates, :site_id, :integer
     add_index :spud_templates,:site_id

data/db/migrate/20120329132330_add_site_id_to_spud_menus.rb

@@ -1,4 +1,4 @@
-class AddSiteIdToSpudMenus < ActiveRecord::Migration
+class AddSiteIdToSpudMenus < ActiveRecord::Migration[4.2]
   def change
   	add_column :spud_menus, :site_id, :integer
     add_index :spud_menus,:site_id

data/db/migrate/20120510195151_create_spud_page_partial_revisions.rb

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

data/db/migrate/20120911190030_add_symbol_name_to_spud_page_partials.rb

@@ -1,4 +1,4 @@
-class AddSymbolNameToSpudPagePartials < ActiveRecord::Migration
+class AddSymbolNameToSpudPagePartials < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_page_partials, :symbol_name, :string
   end

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
@@ -40,12 +39,8 @@ module Spud
         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/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Cms
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.1'.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/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/db/migrate/20141231214446_create_spud_admin_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20111214161011)
-class CreateSpudAdminPermissions < ActiveRecord::Migration
+class CreateSpudAdminPermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_admin_permissions do |t|
       t.integer :user_id

data/spec/dummy/db/migrate/20141231214447_create_spud_users.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20111214161146)
-class CreateSpudUsers < ActiveRecord::Migration
+class CreateSpudUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_users do |t|
 

data/spec/dummy/db/migrate/20141231214448_add_time_zone_to_spud_user.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20120327124229)
-class AddTimeZoneToSpudUser < ActiveRecord::Migration
+class AddTimeZoneToSpudUser < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_users, :time_zone, :string
   end

data/spec/dummy/db/migrate/20141231214449_add_scope_to_spud_admin_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20120328235431)
-class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
+class AddScopeToSpudAdminPermissions < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_admin_permissions, :scope, :string
   end

data/spec/dummy/db/migrate/20141231214450_create_spud_user_settings.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20120329174000)
-class CreateSpudUserSettings < ActiveRecord::Migration
+class CreateSpudUserSettings < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_user_settings do |t|
       t.integer :spud_user_id

data/spec/dummy/db/migrate/20141231214451_create_spud_roles.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620143010)
-class CreateSpudRoles < ActiveRecord::Migration
+class CreateSpudRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_roles do |t|
       t.string :name

data/spec/dummy/db/migrate/20141231214452_create_spud_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620143941)
-class CreateSpudPermissions < ActiveRecord::Migration
+class CreateSpudPermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_permissions do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/20141231214453_create_spud_role_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620151132)
-class CreateSpudRolePermissions < ActiveRecord::Migration
+class CreateSpudRolePermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_role_permissions do |t|
       t.integer :spud_role_id, null: false

data/spec/dummy/db/migrate/20141231214454_drop_spud_admin_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620163144)
-class DropSpudAdminPermissions < ActiveRecord::Migration
+class DropSpudAdminPermissions < ActiveRecord::Migration[4.2]
   def up
     drop_table :spud_admin_permissions
   end

data/spec/dummy/db/migrate/20141231214455_create_spud_permalinks.tb_permalinks.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_permalinks (originally 20120306195503)
-class CreateSpudPermalinks < ActiveRecord::Migration
+class CreateSpudPermalinks < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_permalinks do |t|
       t.string :url_name

data/spec/dummy/db/migrate/20141231214456_add_site_id_to_spud_permalinks.tb_permalinks.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_permalinks (originally 20120329135522)
-class AddSiteIdToSpudPermalinks < ActiveRecord::Migration
+class AddSiteIdToSpudPermalinks < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_permalinks, :site_id, :integer
     add_index :spud_permalinks, :site_id, name: 'idx_permalinks_site_id'

data/spec/dummy/db/migrate/20141231214457_modify_site_id_for_spud_permalinks.tb_permalinks.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_permalinks (originally 20120912123700)
-class ModifySiteIdForSpudPermalinks < ActiveRecord::Migration
+class ModifySiteIdForSpudPermalinks < ActiveRecord::Migration[4.2]
   def up
     change_column :spud_permalinks, :site_id, :integer, default: 0, null: false
     # SpudPermalink.where(:site_id => nil).each {|f| f.site_id = 0 ; f.save}

data/spec/dummy/db/migrate/20141231214459_create_spud_pages.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120101192412)
-class CreateSpudPages < ActiveRecord::Migration
+class CreateSpudPages < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_pages do |t|
       t.string :name

data/spec/dummy/db/migrate/20141231214460_create_spud_menus.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120101193138)
-class CreateSpudMenus < ActiveRecord::Migration
+class CreateSpudMenus < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_menus do |t|
       t.string :name

data/spec/dummy/db/migrate/20141231214461_create_spud_menu_items.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120101193255)
-class CreateSpudMenuItems < ActiveRecord::Migration
+class CreateSpudMenuItems < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_menu_items do |t|
       t.string :parent_type

data/spec/dummy/db/migrate/20141231214462_create_spud_templates.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120101194124)
-class CreateSpudTemplates < ActiveRecord::Migration
+class CreateSpudTemplates < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_templates do |t|
       t.string :name

data/spec/dummy/db/migrate/20141231214463_create_spud_page_partials.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120103034659)
-class CreateSpudPagePartials < ActiveRecord::Migration
+class CreateSpudPagePartials < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_page_partials do |t|
       t.integer :spud_page_id

data/spec/dummy/db/migrate/20141231214464_add_visibility_to_spud_pages.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120104194032)
-class AddVisibilityToSpudPages < ActiveRecord::Migration
+class AddVisibilityToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :visibility, :integer, default: 0
     add_column :spud_pages, :published, :boolean, default: true

data/spec/dummy/db/migrate/20141231214465_add_menu_name_to_spud_menu_items.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120107181337)
-class AddMenuNameToSpudMenuItems < ActiveRecord::Migration
+class AddMenuNameToSpudMenuItems < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_menu_items, :name, :string
   end

data/spec/dummy/db/migrate/20141231214466_add_use_custom_url_name_to_spud_pages.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120111134754)
-class AddUseCustomUrlNameToSpudPages < ActiveRecord::Migration
+class AddUseCustomUrlNameToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :use_custom_url_name, :boolean, default: false
   end

data/spec/dummy/db/migrate/20141231214467_add_notes_to_spud_pages.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120118141852)
-class AddNotesToSpudPages < ActiveRecord::Migration
+class AddNotesToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :notes, :text
   end

data/spec/dummy/db/migrate/20141231214468_add_menu_id_to_spud_menu_items.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120126232428)
-class AddMenuIdToSpudMenuItems < ActiveRecord::Migration
+class AddMenuIdToSpudMenuItems < ActiveRecord::Migration[4.2]
 
   def change
     add_column :spud_menu_items, :spud_menu_id, :integer

data/spec/dummy/db/migrate/20141231214469_add_classes_to_spud_menu_items.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120128163601)
-class AddClassesToSpudMenuItems < ActiveRecord::Migration
+class AddClassesToSpudMenuItems < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_menu_items, :classes, :string
   end

data/spec/dummy/db/migrate/20141231214470_add_site_id_to_spud_pages.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120329132314)
-class AddSiteIdToSpudPages < ActiveRecord::Migration
+class AddSiteIdToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :site_id, :integer
     add_index :spud_pages, :site_id

data/spec/dummy/db/migrate/20141231214471_add_site_id_to_spud_templates.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120329132322)
-class AddSiteIdToSpudTemplates < ActiveRecord::Migration
+class AddSiteIdToSpudTemplates < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_templates, :site_id, :integer
     add_index :spud_templates, :site_id

data/spec/dummy/db/migrate/20141231214472_add_site_id_to_spud_menus.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120329132330)
-class AddSiteIdToSpudMenus < ActiveRecord::Migration
+class AddSiteIdToSpudMenus < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_menus, :site_id, :integer
     add_index :spud_menus, :site_id

data/spec/dummy/db/migrate/20141231214473_create_spud_page_partial_revisions.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120510195151)
-class CreateSpudPagePartialRevisions < ActiveRecord::Migration
+class CreateSpudPagePartialRevisions < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_page_partial_revisions do |t|
       t.string :name

data/spec/dummy/db/migrate/20141231214474_add_symbol_name_to_spud_page_partials.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120911190030)
-class AddSymbolNameToSpudPagePartials < ActiveRecord::Migration
+class AddSymbolNameToSpudPagePartials < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_page_partials, :symbol_name, :string
   end

data/spec/dummy/db/migrate/20141231214475_modify_site_id_for_spud_pages.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20120912121313)
-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/spec/dummy/db/migrate/20141231214476_add_content_processed_to_spud_page_partials.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20121016233715)
-class AddContentProcessedToSpudPagePartials < ActiveRecord::Migration
+class AddContentProcessedToSpudPagePartials < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_page_partials, :content_processed, :text
   end

data/spec/dummy/db/migrate/20141231214477_add_layout_to_spud_pages.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20121112151110)
-class AddLayoutToSpudPages < ActiveRecord::Migration
+class AddLayoutToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :layout, :string
 

data/spec/dummy/db/migrate/20141231214479_create_spud_snippets.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20121119025608)
-class CreateSpudSnippets < ActiveRecord::Migration
+class CreateSpudSnippets < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_snippets do |t|
       t.string :name

data/spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20150108162839)
-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/spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20150610143438)
-class AddRequiresPasswordChangeToSpudUsers < ActiveRecord::Migration
+class AddRequiresPasswordChangeToSpudUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_users, :requires_password_change, :boolean, default: false
   end

data/spec/dummy/db/migrate/20150911185844_add_title_tag_to_spud_page.tb_cms.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_cms (originally 20150622161403)
-class AddTitleTagToSpudPage < ActiveRecord::Migration
+class AddTitleTagToSpudPage < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :page_title, :string
   end

data/spec/dummy/db/migrate/20160215180157_create_tb_redirects.tb_redirects.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_redirects (originally 20160211162513)
-class CreateTbRedirects < ActiveRecord::Migration
+class CreateTbRedirects < ActiveRecord::Migration[4.2]
   def change
     create_table :tb_redirects do |t|
       t.string :owner_type

data/spec/dummy/db/schema.rb

@@ -12,16 +12,6 @@
 
 ActiveRecord::Schema.define(version: 20160215180157) do
 
-  create_table "spud_liquid_tags", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer  "attachment_id"
-    t.string   "attachment_type"
-    t.string   "tag_name"
-    t.string   "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["tag_name", "value"], name: "index_spud_liquid_tags_on_tag_name_and_value", using: :btree
-  end
-
   create_table "spud_menu_items", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
     t.string   "parent_type"
     t.integer  "parent_id"

data/spec/helpers/cms/application_helper_spec.rb

@@ -10,16 +10,16 @@ describe Cms::ApplicationHelper, type: :helper do
       menu = FactoryGirl.create(:spud_menu, name: 'Main')
       2.times { |_x| FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/') }
 
-      helper.sp_list_menu(name: 'Main', active_class: 'active')
-      expect(helper.output_buffer).to match /\<li/
+      result = helper.sp_list_menu(name: 'Main', active_class: 'active')
+      expect(result).to match /\<li/
     end
 
     it 'should assign id to ul block' do
       menu = FactoryGirl.create(:spud_menu)
       2.times { |_x| s = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/') }
 
-      helper.sp_list_menu(name: menu.name, id: 'nav')
-      expect(helper.output_buffer).to match /id=\'nav\'/
+      result = helper.sp_list_menu(name: menu.name, id: 'nav')
+      expect(result).to match /id=\'nav\'/
     end
 
     it 'should render nested menu items' do
@@ -28,8 +28,8 @@ describe Cms::ApplicationHelper, type: :helper do
       s2 = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
       s3 = FactoryGirl.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
 
-      helper.sp_list_menu(name: 'Main2')
-      expect(helper.output_buffer).to match /SubItem/
+      result = helper.sp_list_menu(name: 'Main2')
+      expect(result).to match /SubItem/
     end
 
     it 'should respect max depth' do
@@ -38,8 +38,8 @@ describe Cms::ApplicationHelper, type: :helper do
       s2 = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
       s3 = FactoryGirl.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
 
-      helper.sp_list_menu(name: 'Main4', max_depth: 1)
-      expect(helper.output_buffer).to_not match /SubItem/
+      result = helper.sp_list_menu(name: 'Main4', max_depth: 1)
+      expect(result).to_not match /SubItem/
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Moser Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.beta1
-- !ruby/object:Gem::Dependency
-  name: tb_liquid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.beta1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.beta1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -240,10 +226,7 @@ files:
 - db/migrate/20120912121313_modify_site_id_for_spud_pages.rb
 - db/migrate/20121016233715_add_content_processed_to_spud_page_partials.rb
 - db/migrate/20121112151110_add_layout_to_spud_pages.rb
-- db/migrate/20121112212113_create_spud_page_liquid_tags.rb
 - db/migrate/20121119025608_create_spud_snippets.rb
-- db/migrate/20121119030136_change_liquid_tags_to_polymorphic.rb
-- db/migrate/20140110142037_drop_spud_page_liquid_tags.rb
 - db/migrate/20150108162839_remove_site_id_from_cms_tables.rb
 - db/migrate/20150622161403_add_title_tag_to_spud_page.rb
 - lib/generators/spud/cms/layout_generator.rb
@@ -251,7 +234,6 @@ files:
 - lib/generators/spud/cms/templates/layout_actions.rb
 - lib/spud_cms/configuration.rb
 - lib/spud_cms/engine.rb
-- lib/spud_cms/liquid_snippet.rb
 - lib/spud_cms/page_route.rb
 - lib/spud_cms/template_parser.rb
 - lib/spud_cms/test_files.rb
@@ -299,7 +281,6 @@ files:
 - spec/dummy/db/migrate/20141231214455_create_spud_permalinks.tb_permalinks.rb
 - spec/dummy/db/migrate/20141231214456_add_site_id_to_spud_permalinks.tb_permalinks.rb
 - spec/dummy/db/migrate/20141231214457_modify_site_id_for_spud_permalinks.tb_permalinks.rb
-- spec/dummy/db/migrate/20141231214458_create_tb_liquid_spud_liquid_tags.tb_liquid.rb
 - spec/dummy/db/migrate/20141231214459_create_spud_pages.tb_cms.rb
 - spec/dummy/db/migrate/20141231214460_create_spud_menus.tb_cms.rb
 - spec/dummy/db/migrate/20141231214461_create_spud_menu_items.tb_cms.rb
@@ -319,10 +300,7 @@ files:
 - spec/dummy/db/migrate/20141231214475_modify_site_id_for_spud_pages.tb_cms.rb
 - spec/dummy/db/migrate/20141231214476_add_content_processed_to_spud_page_partials.tb_cms.rb
 - spec/dummy/db/migrate/20141231214477_add_layout_to_spud_pages.tb_cms.rb
-- spec/dummy/db/migrate/20141231214478_create_spud_page_liquid_tags.tb_cms.rb
 - spec/dummy/db/migrate/20141231214479_create_spud_snippets.tb_cms.rb
-- spec/dummy/db/migrate/20141231214480_change_liquid_tags_to_polymorphic.tb_cms.rb
-- spec/dummy/db/migrate/20141231214481_drop_spud_page_liquid_tags.tb_cms.rb
 - spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb
 - spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb
 - spec/dummy/db/migrate/20150911185844_add_title_tag_to_spud_page.tb_cms.rb
@@ -404,7 +382,6 @@ test_files:
 - spec/dummy/db/migrate/20141231214455_create_spud_permalinks.tb_permalinks.rb
 - spec/dummy/db/migrate/20141231214456_add_site_id_to_spud_permalinks.tb_permalinks.rb
 - spec/dummy/db/migrate/20141231214457_modify_site_id_for_spud_permalinks.tb_permalinks.rb
-- spec/dummy/db/migrate/20141231214458_create_tb_liquid_spud_liquid_tags.tb_liquid.rb
 - spec/dummy/db/migrate/20141231214459_create_spud_pages.tb_cms.rb
 - spec/dummy/db/migrate/20141231214460_create_spud_menus.tb_cms.rb
 - spec/dummy/db/migrate/20141231214461_create_spud_menu_items.tb_cms.rb
@@ -424,10 +401,7 @@ test_files:
 - spec/dummy/db/migrate/20141231214475_modify_site_id_for_spud_pages.tb_cms.rb
 - spec/dummy/db/migrate/20141231214476_add_content_processed_to_spud_page_partials.tb_cms.rb
 - spec/dummy/db/migrate/20141231214477_add_layout_to_spud_pages.tb_cms.rb
-- spec/dummy/db/migrate/20141231214478_create_spud_page_liquid_tags.tb_cms.rb
 - spec/dummy/db/migrate/20141231214479_create_spud_snippets.tb_cms.rb
-- spec/dummy/db/migrate/20141231214480_change_liquid_tags_to_polymorphic.tb_cms.rb
-- spec/dummy/db/migrate/20141231214481_drop_spud_page_liquid_tags.tb_cms.rb
 - spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb
 - spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb
 - spec/dummy/db/migrate/20150911185844_add_title_tag_to_spud_page.tb_cms.rb

data/db/migrate/20121112212113_create_spud_page_liquid_tags.rb

@@ -1,11 +0,0 @@
-class CreateSpudPageLiquidTags < ActiveRecord::Migration
-  def change
-    create_table :spud_page_liquid_tags do |t|
-      t.integer :spud_page_partial_id
-      t.string :tag_name
-      t.string :value
-      t.timestamps
-    end
-    add_index :spud_page_liquid_tags, [:tag_name,:value]
-  end
-end

data/db/migrate/20121119030136_change_liquid_tags_to_polymorphic.rb

@@ -1,17 +0,0 @@
-class ChangeLiquidTagsToPolymorphic < ActiveRecord::Migration
-  def up
-    rename_column :spud_page_liquid_tags, :spud_page_partial_id, :attachment_id
-    add_column :spud_page_liquid_tags, :attachment_type, :string
-    add_index :spud_page_liquid_tags, [:attachment_type, :attachment_id], :name => 'inde_spud_page_liquid_tags_on_attachment'
-    if defined?(SpudPageLiquidTag)
-      SpudPageLiquidTag.all.each do |f|
-        f.update_attributes(:attachment_type => "SpudPagePartial")
-      end
-    end
-  end
-
-  def down
-    rename_column :spud_page_liquid_tags, :attachment_id, :spud_page_partial_id
-    remove_column :spud_page_liquid_tags, :attachment_type
-  end
-end

data/db/migrate/20140110142037_drop_spud_page_liquid_tags.rb

@@ -1,31 +0,0 @@
-class DropSpudPageLiquidTags < ActiveRecord::Migration
-
-  class SpudPageLiquidTag < ActiveRecord::Base
-  end
-
-  def up
-    if defined?(SpudLiquidTag)
-      SpudPageLiquidTag.all.each do |tag|
-        SpudLiquidTag.create({
-          :attachment_id => tag.attachment_id,
-          :attachment_type => tag.attachment_type,
-          :tag_name => tag.tag_name,
-          :value => tag.value
-        })
-      end
-    end
-    drop_table :spud_page_liquid_tags
-  end
-
-  def down
-    create_table :spud_page_liquid_tags do |t|
-      t.integer :attachment_id
-      t.string :attachment_type
-      t.string :tag_name
-      t.string :value
-      t.timestamps
-    end
-    add_index :spud_page_liquid_tags, [:tag_name,:value]
-    add_index :spud_page_liquid_tags, [:attachment_type,:attachment_id]
-  end
-end

data/lib/spud_cms/liquid_snippet.rb

@@ -1,27 +0,0 @@
-require 'liquid'
-module Spud
-  module Cms
-    class LiquidSnippet < Liquid::Tag
-      def initialize(_tag_name, snippet_name, _tokens)
-        @snippet_name = snippet_name
-        @snippet = SpudSnippet.where(name: snippet_name).first
-      end
-
-      def tag_name
-        return 'snippet'
-      end
-
-      def tag_value
-        return @snippet_name
-      end
-
-      def render(_context)
-        if !@snippet.blank?
-          return @snippet.content_processed.html_safe
-        else
-          return ''
-        end
-      end
-    end
-  end
-end

data/spec/dummy/db/migrate/20141231214458_create_tb_liquid_spud_liquid_tags.tb_liquid.rb

@@ -1,13 +0,0 @@
-# This migration comes from tb_liquid (originally 20140110142037)
-class CreateTbLiquidSpudLiquidTags < ActiveRecord::Migration
-  def change
-    create_table :spud_liquid_tags do |t|
-      t.integer :attachment_id
-      t.string :attachment_type
-      t.string :tag_name
-      t.string :value
-      t.timestamps
-    end
-    add_index :spud_liquid_tags, [:tag_name, :value]
-  end
-end

data/spec/dummy/db/migrate/20141231214478_create_spud_page_liquid_tags.tb_cms.rb

@@ -1,12 +0,0 @@
-# This migration comes from tb_cms (originally 20121112212113)
-class CreateSpudPageLiquidTags < ActiveRecord::Migration
-  def change
-    create_table :spud_page_liquid_tags do |t|
-      t.integer :spud_page_partial_id
-      t.string :tag_name
-      t.string :value
-      t.timestamps
-    end
-    add_index :spud_page_liquid_tags, [:tag_name, :value]
-  end
-end

data/spec/dummy/db/migrate/20141231214480_change_liquid_tags_to_polymorphic.tb_cms.rb

@@ -1,18 +0,0 @@
-# This migration comes from tb_cms (originally 20121119030136)
-class ChangeLiquidTagsToPolymorphic < ActiveRecord::Migration
-  def up
-    rename_column :spud_page_liquid_tags, :spud_page_partial_id, :attachment_id
-    add_column :spud_page_liquid_tags, :attachment_type, :string
-    add_index :spud_page_liquid_tags, [:attachment_type, :attachment_id], name: 'inde_spud_page_liquid_tags_on_attachment'
-    if defined?(SpudPageLiquidTag)
-      SpudPageLiquidTag.all.each do |f|
-        f.update_attributes(attachment_type: 'SpudPagePartial')
-      end
-    end
-  end
-
-  def down
-    rename_column :spud_page_liquid_tags, :attachment_id, :spud_page_partial_id
-    remove_column :spud_page_liquid_tags, :attachment_type
-  end
-end

data/spec/dummy/db/migrate/20141231214481_drop_spud_page_liquid_tags.tb_cms.rb

@@ -1,30 +0,0 @@
-# This migration comes from tb_cms (originally 20140110142037)
-class DropSpudPageLiquidTags < ActiveRecord::Migration
-
-  class SpudPageLiquidTag < ActiveRecord::Base
-  end
-
-  def up
-    if defined?(SpudLiquidTag)
-      SpudPageLiquidTag.all.each do |tag|
-        SpudLiquidTag.create(attachment_id: tag.attachment_id,
-                             attachment_type: tag.attachment_type,
-                             tag_name: tag.tag_name,
-                             value: tag.value)
-      end
-    end
-    drop_table :spud_page_liquid_tags
-  end
-
-  def down
-    create_table :spud_page_liquid_tags do |t|
-      t.integer :attachment_id
-      t.string :attachment_type
-      t.string :tag_name
-      t.string :value
-      t.timestamps
-    end
-    add_index :spud_page_liquid_tags, [:tag_name, :value]
-    add_index :spud_page_liquid_tags, [:attachment_type, :attachment_id]
-  end
-end