tb_cms 1.3.0 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec75c53b2b39e4b6fe5a0e7968c1f54a695403b4
-  data.tar.gz: 79126403fdfc7cdc63e65ac01e14a883570eeb06
+  metadata.gz: 13270a188b116b592cf0ca1dfcc2693f89e10a72
+  data.tar.gz: ce7dfc3f907926f416f053b15276801570230840
 SHA512:
-  metadata.gz: e79dba5b06e5998468ea5d1d4ec15a0bde3173563770a9a2b1eb1759eac376f0fac84489ddf7840f0e19c3e54d38725a80bd0ff9ec80d419ae4565479a42a1d3
-  data.tar.gz: 934771b2dd67cffad7f93b80d6a6edd3a93cd56754a78a05178618683b5eb0239971ada653436f82c196d100e2edac7498948f80c6f604f697c3d1f38d5354c6
+  metadata.gz: '09f2d4d365bd67a2e929d66c446cb34cffdcb60c9c07ced83c979261b2bc7be43507d8ba0e47f9f4965800cc74d852d13a1a1505667e9d103623f1fecaf30fd8'
+  data.tar.gz: b2c889ecec952493d8ea28fe54812f682cd8b0939455e718c6415d53fca081ab3dad0fec60c215edd7a09fcd919bd5a280a2decf004e30d09a738e15ae4ad0a7

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

@@ -2,4 +2,4 @@
 //= require admin/cms/pages
 //= require admin/cms/menu_items
 
-spud.admin.cms = {};
+tb.cms = {};

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

@@ -1,9 +1,9 @@
-spud.admin.cms.menu_items = {};
+tb.cms.menu_items = {};
 
 (function() {
-  var menu_items = spud.admin.cms.menu_items;
+  var menu_items = tb.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/assets/javascripts/admin/cms/pages.js

@@ -1,11 +1,10 @@
-spud.admin.cms.pages = {};
+tb.cms.pages = {};
 
 (function(){
 
-spud.admin.cms.pages = {
+tb.cms.pages = {
   edit: function(){
-    spud.admin.editor.init({selector: '.page-partial-content-editor', width: $("#page_partials_form").width()});
-    spud.admin.cms.pages.initFormTabs();
+    tb.cms.pages.initFormTabs();
     $(".btn-preview").on('click', clickedPreviewButton);
     $("#spud_page_layout").on('change', changedLayoutSelection);
   }
@@ -24,6 +23,9 @@ var clickedPreviewButton = function(e){
     form.target = '';
     form.onSubmit = null;
     previewInput.val(0);
+    form.querySelectorAll('.btn').forEach(function(btn) {
+      btn.disabled = false;
+    });
   }, 200);
 };
 
@@ -34,16 +36,16 @@ var changedLayoutSelection = function(e){
     spud.admin.editor.unload();
 
     $("#page_partials_form").replaceWith(data);
-    spud.admin.cms.pages.initFormTabs();
+    tb.cms.pages.initFormTabs();
 
-    spud.admin.editor.init({selector: '.page-partial-content-editor', width: $("#page_partials_form").width()});
+    tb.editor.init();
 
   }, 'text').error(function(jqXHR) {
     alert("Error: " + jqXHR.responseText);
   });
 };
 
-spud.admin.cms.pages.initFormTabs = function(){
+tb.cms.pages.initFormTabs = function(){
   var tabNames = [];
 
   $('.formtabs .formtab').each(function(tabind) {

data/app/controllers/admin/pages_controller.rb

@@ -4,7 +4,7 @@ class Admin::PagesController < Admin::ApplicationController
   before_action :load_page, only: [:edit, :update, :show, :destroy]
 
   def index
-    @pages = SpudPage.where(spud_page_id: nil).order(:page_order).includes(:spud_pages)
+    @pages = SpudPage.where(spud_page_id: nil).ordered.includes(:spud_pages)
     home_page = SpudPage.where(url_name: Spud::Cms.root_page_name).first
     if home_page.blank?
       flash.now[:warning] = "You have not setup your default CMS page. This page will be your homepage. To do so, create a page with the name '#{Spud::Cms.root_page_name.titlecase}'"

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/controllers/pages_controller.rb

@@ -12,7 +12,7 @@ class PagesController < ApplicationController
     end
 
     url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
-    @page = SpudPage.published_pages.find_by(url_name: url_name)
+    @page = SpudPage.published_pages.find_ignoring_case(url_name)
 
     if @page.blank?
       render_404
@@ -34,11 +34,11 @@ class PagesController < ApplicationController
   private
 
   def render_404
-    raise Spud::NotFoundError, item: 'page'
-   end
+    raise TbCore::NotFoundError, item: 'page'
+  end
 
   def set_default_content_type
     request.format = :html if params[:format].blank?
-   end
+  end
 
 end

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_menu_item.rb

@@ -1,7 +1,7 @@
 class SpudMenuItem < ActiveRecord::Base
-  belongs_to :parent, polymorphic: true
-  belongs_to :spud_menu, touch: true
-  belongs_to :spud_page
+  belongs_to :parent, polymorphic: true, required: false
+  belongs_to :spud_menu, touch: true, required: false
+  belongs_to :spud_page, required: false
   has_many :spud_menu_items, as: :parent, dependent: :destroy
 
   validates :name, presence: true

data/app/models/spud_page.rb

@@ -2,13 +2,19 @@ class SpudPage < ActiveRecord::Base
   include CmsDeprecatedMultisite
   include TbRedirects::HasRedirects
 
-  spud_searchable
-  belongs_to :spud_page
+  belongs_to :spud_page,
+    required: false
   has_many :spud_page_partial_revisions
   has_many :spud_pages, dependent: :nullify
   has_many :spud_page_partials, dependent: :destroy
-  belongs_to :created_by_user, class_name: 'SpudUser', foreign_key: :created_by
-  belongs_to :updated_by_user, class_name: 'SpudUser', foreign_key: :updated_by
+  belongs_to :created_by_user,
+    class_name: 'SpudUser',
+    foreign_key: :created_by,
+    required: false
+  belongs_to :updated_by_user,
+    class_name: 'SpudUser',
+    foreign_key: :updated_by,
+    required: false
 
   before_validation :generate_url_name
   validates :name, presence: true, uniqueness: { scope: :spud_page_id }
@@ -20,13 +26,15 @@ class SpudPage < ActiveRecord::Base
   scope :parent_pages, -> { where(spud_page_id: nil) }
   scope :published_pages, -> { where(published: true) }
   scope :viewable, -> { where(visibility: 0) }
+  scope :ordered, -> { order(page_order: :asc, name: :asc) }
 
   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 +51,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
@@ -52,6 +60,10 @@ class SpudPage < ActiveRecord::Base
     return visibility == 1
   end
 
+  def self.find_ignoring_case(url_name)
+    find_by(arel_table[:url_name].matches(url_name))
+  end
+
   private
 
   def generate_url_name
@@ -65,13 +77,13 @@ class SpudPage < ActiveRecord::Base
   end
 
   def create_redirect_if_necessary
-    if url_name_changed?
-      TbRedirect.create_smart(source: "/#{url_name_was}",
+    if saved_change_to_attribute?(:url_name)
+      TbRedirect.create_smart(source: "/#{attribute_before_last_save(:url_name)}",
                               destination: "/#{url_name}",
                               created_by: 'cms',
                               owner: self)
     end
-    return true
+    true
   end
 
 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/admin/menu_items/index.html.erb

@@ -21,8 +21,8 @@
     <input type="hidden" value=<%= @menu.id %> id="menu-id">
   </div>
 <script type="text/javascript">
-  $(document).ready(spud.admin.cms.menu_items.init);
+  $(document).ready(tb.cms.menu_items.init);
 </script>
 
 <% end %>
-  
+

data/app/views/admin/pages/_form.html.erb

@@ -17,7 +17,7 @@
 	<%= f.fields_for :spud_page_partials do |b| %>
 		<div class="formtab tab-pane">
 			<%= b.hidden_field :name, :class => "tab_name" %>
-			<%= b.text_area :content, :class => "page-partial-content-editor" %>
+			<%= b.text_area :content, :class => "page-partial-content-editor tinymce" %>
 		</div>
 	<% end %>
 </div>
@@ -101,5 +101,5 @@
 <%= hidden_field_tag "preview", 0 %>
 
 <script type="text/javascript">
-  $(document).ready(spud.admin.cms.pages.edit);
+  $(document).ready(tb.cms.pages.edit);
 </script>

data/app/views/admin/pages/_page_partials_form.html.erb

@@ -8,7 +8,7 @@
 			<% if spud_page_partial.id %>
 				<%= hidden_field_tag "spud_page[spud_page_partials_attributes][#{index}][id]", spud_page_partial.id %>
 			<% end %>
-			<textarea class="page-partial-content-editor" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
+			<textarea class="page-partial-content-editor tinymce" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
 				<%= spud_page_partial.content %>
 			</textarea>
 		</div>

data/app/views/admin/pages/_page_row.html.erb

@@ -10,6 +10,6 @@
     <%= link_to 'Delete', admin_page_path(page), :method => :delete, :data => {:confirm => 'Are you sure?"'}, :class => 'btn btn-danger btn-sm' %>
   </td>
 </tr>
-<% page.spud_pages.each do |page| %>
+<% page.spud_pages.ordered.each do |page| %>
 	<%= render :partial => 'page_row', :locals => {:depth => depth+1, :page => page} %>
 <% end %>

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

@@ -1,20 +1,17 @@
-
 <%=content_for :head do%>
-	<meta name="description" content="<%=@page.meta_description%>" />
-
-	  <meta name="keywords" content="<%=@page.meta_keywords%>" />
+  <meta name="description" content="<%=@page.meta_description%>" />
+  <meta name="keywords" content="<%=@page.meta_keywords%>" />
 <% end %>
 
-<%if !@inline.blank?%>
-	<%=render :inline => @inline%>
+<% if !@inline.blank? %>
+  <%= render :inline => @inline %>
 <% end %>
-<%@page.spud_page_partials.each do |page_partial|%>
-
-	<%if(page_partial.name.downcase == 'body' && Spud::Cms.yield_body_as_content_block == false)%>
-		<%=page_partial.postprocess_content.html_safe%>
-	<%else%>
-		<%=content_for page_partial.name.parameterize.underscore.to_sym do%>
-			<%=page_partial.postprocess_content.html_safe%>
-		<% end %>
-	<% end %>
+<% @page.spud_page_partials.each do |page_partial| %>
+  <% if page_partial.name.downcase == 'body' && Spud::Cms.yield_body_as_content_block == false %>
+    <%= page_partial.content.html_safe %>
+  <% else %>
+    <%= content_for page_partial.name.parameterize.underscore.to_sym do %>
+      <%= page_partial.content.html_safe %>
+    <% end %>
+  <% end %>
 <% end %>

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