tb_cms 1.0.3 → 1.1.0

data/app/models/spud_menu.rb

@@ -1,9 +1,8 @@
 class SpudMenu < ActiveRecord::Base
 	validates :name,:presence => true
 	validates_uniqueness_of :name, :scope => [:site_id]
-	has_many :spud_menu_items,:as => :parent,:dependent => :destroy
-	has_many :spud_menu_items_combined,:class_name => "SpudMenuItem",:foreign_key => :spud_menu_id,:dependent => :destroy
+	has_many :spud_menu_items, :as => :parent, :dependent => :destroy
+	has_many :spud_menu_items_combined, :class_name => "SpudMenuItem", :foreign_key => :spud_menu_id, :dependent => :destroy
 	
-	attr_protected :site_id
 	scope :site, lambda {|sid| where(:site_id => sid)}
 end

data/app/models/spud_menu_item.rb

@@ -1,6 +1,6 @@
 class SpudMenuItem < ActiveRecord::Base
 	belongs_to :parent, :polymorphic=>true
-	belongs_to :spud_menu
+	belongs_to :spud_menu, :touch => true
 	belongs_to :spud_page
 	has_many :spud_menu_items,:as => :parent,:dependent => :destroy
 
@@ -9,9 +9,6 @@ class SpudMenuItem < ActiveRecord::Base
 	validates :parent_type,:presence => true
 	validates :parent_id,:presence => true
 
-
-	attr_accessible :name,:parent_type,:parent_id,:item_type,:spud_page_id,:menu_order,:url,:classes
-
 	def get_url
 		if !self.spud_page.blank?
 			return self.spud_page.url_name

data/app/models/spud_page.rb

@@ -8,9 +8,6 @@ class SpudPage < ActiveRecord::Base
 	belongs_to :created_by_user,:class_name => "SpudUser",:foreign_key => :created_by
 	belongs_to :updated_by_user,:class_name => "SpudUser",:foreign_key => :updated_by
 
-
-	attr_accessible :name,:url_name,:created_by,:updated_by,:layout,:visibility,:spud_page_id,:publish_at,:format,:meta_description,:meta_keywords,:page_order,:spud_page_partials_attributes,:use_custom_url_name,:published,:notes
-
 	before_validation :generate_url_name
 	validates :name,:presence => true
 	validates_uniqueness_of :name, :scope => [:site_id,:spud_page_id]
@@ -18,10 +15,11 @@ class SpudPage < ActiveRecord::Base
 	validates_uniqueness_of :url_name, :scope => :site_id
 
 	accepts_nested_attributes_for :spud_page_partials, :allow_destroy => true
-	scope :parent_pages,  where(:spud_page_id => nil)
+
+	scope :parent_pages, ->{ where(:spud_page_id => nil)}
 	scope :site, lambda {|sid| where(:site_id => sid)}
-	scope :published_pages, where(:published => true)
-	scope :public, where(:visibility => 0)
+	scope :published_pages, ->{ where(:published => true) }
+	scope :public, ->{ where(:visibility => 0) }
 
 	def full_content_processed
 		self.spud_page_partials.collect{|partial| partial.content_processed }.join(' ')
@@ -30,7 +28,7 @@ class SpudPage < ActiveRecord::Base
 	def self.grouped(site_id=0)
 
 		if(Spud::Core.multisite_mode_enabled)
-			return site(site_id).all.group_by(&:spud_page_id)
+			return site(site_id).to_a.group_by(&:spud_page_id)
 		else
 			return all.group_by(&:spud_page_id)
 		end
@@ -76,7 +74,7 @@ class SpudPage < ActiveRecord::Base
 				if !self.id.blank?
 					pages = pages.where("id != #{self.id}")
 				end
-				url_names = pages.site(self.site_id).all.collect{|p| p.url_name}
+				url_names = pages.site(self.site_id).load.collect{|p| p.url_name}
 
 				counter = 1
 				url_name_new = url_name

data/app/models/spud_page_partial.rb

@@ -1,12 +1,11 @@
 class SpudPagePartial < ActiveRecord::Base
-	belongs_to :spud_page
-	has_many :spud_page_liquid_tags, :as => :attachment, :dependent => :destroy
+	belongs_to :spud_page, :touch => true
+	has_many :spud_liquid_tags, :as => :attachment, :dependent => :destroy
 	validates :name,:presence => true
-	attr_accessible :name, :spud_page_id, :content, :format, :content_processed
 	before_save :maintain_revisions
 	before_save :update_symbol_name
-	before_save :postprocess_content
-	after_save :update_taglist
+	acts_as_spud_liquid_content
+
 	def update_symbol_name
 		self.symbol_name = self.name.parameterize.underscore
 	end
@@ -16,22 +15,8 @@ class SpudPagePartial < ActiveRecord::Base
 	end
 
 	def postprocess_content
-		template = Liquid::Template.parse(self.content) # Parses and compiles the template
-
-		self.content_processed = template.render('page' => self.spud_page)
-	end
-
-	def update_taglist
-		template = Liquid::Template.parse(self.content) # Parses and compiles the template
-
-		self.spud_page_liquid_tags.all.each do |tag|
-			tag.destroy
-		end
-		template.root.nodelist.each do |node|
-			if !node.is_a?(String) && defined?(node.tag_name) && defined?(node.tag_value)
-				self.spud_page_liquid_tags.create(:tag_name => node.tag_name,:value => node.tag_value)
-			end
-		end
+		@_template = Liquid::Template.parse(self.content)
+		self.content_processed = @_template.render('page' => self.spud_page)
 	end
 
 	def content_processed=(content)

data/app/models/spud_page_partial_revision.rb

@@ -1,5 +1,5 @@
 class SpudPagePartialRevision < ActiveRecord::Base
 	belongs_to :spud_page
 	
-	attr_accessible :name,:content,:format,:spud_page_id
+	#attr_accessible :name,:content,:format,:spud_page_id
 end

data/app/models/spud_snippet.rb

@@ -1,16 +1,14 @@
 class SpudSnippet < ActiveRecord::Base
-  attr_accessible :content, :content_processed, :format, :name
-  has_many :spud_page_liquid_tags, :as => :attachment, :dependent => :destroy
 
   validates :name, :presence => true
   validates_uniqueness_of :name, :scope => :site_id
 
   scope :site, lambda {|sid| where(:site_id => sid)}
 
-  before_save :postprocess_content
-  after_save :update_taglist
+  acts_as_spud_liquid_content
+
   def postprocess_content
-    template = Liquid::Template.parse(self.content) # Parses and compiles the template
+    template = Liquid::Template.parse(self.content)
     self.content_processed = template.render()
   end
 
@@ -25,18 +23,4 @@ class SpudSnippet < ActiveRecord::Base
     return read_attribute(:content_processed)
   end
 
-
-  def update_taglist
-    template = Liquid::Template.parse(self.content) # Parses and compiles the template
-
-    self.spud_page_liquid_tags.all.each do |tag|
-      tag.destroy
-    end
-    template.root.nodelist.each do |node|
-      if !node.is_a?(String) && defined?(node.tag_name) && defined?(node.tag_value)
-        self.spud_page_liquid_tags.create(:tag_name => node.tag_name,:value => node.tag_value)
-      end
-    end
-  end
-
 end

data/app/views/admin/menu_items/_menu_item_row.html.erb

@@ -2,12 +2,12 @@
 
 	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to menu_item.name,edit_admin_menu_menu_item_path(:id => menu_item.id)%></span>
 
-	<span class="edit_controls"><%=link_to "Edit",edit_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this menu item?"%></span>
+	<span class="edit_controls"><%=link_to "Edit",edit_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'btn btn-danger', :data => {:confirm => "Are you sure you want to remove this menu item?"}%></span>
 	<br style="clear:both;"/>
 </div>
 <ul class="menu_list subitem sortable connectedSortable">
 
-<%if !menu_item.spud_menu_items.all.blank?%>
+<% if menu_item.spud_menu_items.length > 0 %>
 
 
 	<%menu_item.spud_menu_items.order(:menu_order).each do |menu_item|%>

data/app/views/admin/menus/index.html.erb

@@ -1,6 +1,6 @@
-<%=content_for :data_controls do%>
-<%=link_to "New Menu",new_admin_menu_path(),:class => "btn btn-primary",:title => "New Menu"%>
-<%end%>
+<% content_for :data_controls do%>
+	<%= link_to "New Menu",new_admin_menu_path(),:class => "btn btn-primary",:title => "New Menu" %>
+<% end %>
 <%=content_for :detail do%>
 	<div class="page_list">
 			<%@menus.each do |menu|%>
@@ -10,15 +10,12 @@
 
 					<span class="edit_controls">
 						<%=link_to "Edit",edit_admin_menu_path(:id => menu.id),:class => 'btn'%>
-						<%=link_to "Remove",admin_menu_path(:id => menu.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this menu and all items associated with it?"%>
+						<%=link_to 'Items', admin_menu_menu_items_path(:menu_id => menu.id), :class => 'btn' %>
+						<%=link_to "Remove",admin_menu_path(:id => menu.id),:method => :delete,:class => 'btn btn-danger', :data => {:confirm => "Are you sure you want to remove this menu and all items associated with it?"}%>
 					</span>
 					<br style="clear:both;"/>
 				</div>
 			<%end%>
 			<%=will_paginate @menus%>
-
-	</div>
-
-
-	
+	</div>	
 <%end%>

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

@@ -1,18 +1,18 @@
-<div class="page_row">
-					
-	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to page.name,edit_admin_page_path(:id => page.id)%></span>
-
-	<span class="edit_controls"><%=link_to "Preview",admin_page_path(:id => page.id), :title => "Preview",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",admin_page_path(:id => page.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this page?"%></span>
+<div class="page_row">				
+	<span class="row_meta">
+		<%=prefix if defined? prefix%><%=link_to page.name,edit_admin_page_path(:id => page.id)%>
+	</span>
+	<span class="edit_controls">
+		<%=link_to "Preview",admin_page_path(:id => page.id), :title => "Preview",:class => 'btn btn-mini'%>
+		<%=link_to "Remove",admin_page_path(:id => page.id),:method => :delete,:class => 'btn btn-mini btn-danger', :data =>{:confirm => "Are you sure you want to remove this page?"} %>
+	</span>
 	<br style="clear:both;"/>
 </div>
-<%if !page.spud_pages.all.blank?%>
-	
-		<div class="left_guide">
-	
-	<%page.spud_pages.each do |spud_page|%>
-		<%=render :partial => 'page_row',:locals => {:page => spud_page}%>
-	<%end%>
-	
-		</div>
-	
-<%end%>
+
+<% if !page.spud_pages.load.blank? %>
+	<div class="left_guide">
+		<% page.spud_pages.each do |spud_page| %>
+			<%= render :partial => 'page_row', :locals => {:page => spud_page} %>
+		<%end%>
+	</div>
+<% end %>

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

@@ -1,7 +1,7 @@
 <%=form_for @page,:url => admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal page_form",:target => "report" } do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
     <div class="form-actions">
-    	<%=f.submit "Save Page", :class=>"btn btn-primary btn-save",:onclick => "savePage();"%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",admin_pages_path,:class => "btn"%>
+    	<%=f.submit "Save Page", :class=>"btn btn-primary btn-save" %>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",admin_pages_path,:class => "btn"%>
     </div>
 <%end%>
 <br />

data/app/views/admin/snippets/index.html.erb

@@ -10,7 +10,7 @@
 
           <span class="edit_controls">
 
-            <%=link_to "Remove",admin_snippet_path(:id => snippet.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this snippet?"%>
+            <%=link_to "Remove",admin_snippet_path(:id => snippet.id),:method => :delete,:class => 'btn btn-danger', :data => {:confirm => "Are you sure you want to remove this snippet?"} %>
           </span>
           <br style="clear:both;"/>
         </div>

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

@@ -1,24 +1,29 @@
-<%=content_for :title do%>
-	<%= @page.name %> | <%=current_site_name%>
-<% end %>
-<%=content_for :head do%>
-	<%if !@page.meta_description.blank?%>
-		<meta name="description" content="<%=@page.meta_description%>" />
-	<%end%>
-
-		<meta name="keywords" content="<%=@page.meta_keywords%>" />
+<% @page_title = @page.name %>
 
-<%end%>
+<%= content_for :head do %>
+	<% cache([@page, 'head']) do %>
+		<% if @page.meta_description.present? %>
+			<meta name="description" content="<%= @page.meta_description %>" />
+		<% end %>
+		<% if @page.meta_keywords.present? %>
+			<meta name="keywords" content="<%= @page.meta_keywords %>" />
+		<% end %>
+	<% end %>
+<% end %>
 
-<%if !@inline.blank?%>
-	<%=render :inline => @inline%>
-<%end%>
-<%@page.spud_page_partials.each do |page_partial|%>
-	<%if(page_partial.name.match(/^body$/i) && Spud::Cms.yield_body_as_content_block == false)%>
-		<%=page_partial.content_processed.html_safe%>
-	<%else%>
-		<%=content_for page_partial.symbol_name.to_sym do%>
-			<%=page_partial.content_processed.html_safe%>
-		<%end%>
-	<%end%>
-<%end%>
+<% if !@inline.blank? %>
+	<%= render :inline => @inline %>
+<% end %>
+<% @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 %>
+		<% end %>
+	<% else%>
+		<%= content_for page_partial.symbol_name.to_sym do %>
+			<% cache(page_partial) do %>
+				<%= page_partial.content_processed.html_safe %>
+			<% end %>
+		<% end %>
+	<% end %>
+<% end %>

data/config/routes.rb

@@ -16,13 +16,10 @@ Rails.application.routes.draw do
  	end
 
   namespace :cms do
-    resource :sitemap,:only => "show"
+    resource :sitemap, :only => "show"
   end
 
   root :to => 'pages#show'
 
-  # This is located in lib/spud_cms/page_route.rb to make sure it is loaded last
-  # match "*id", :controller => "pages",:action => "show", :as => "page"
-
 end
 

data/db/migrate/20121119030136_change_liquid_tags_to_polymorphic.rb

@@ -5,8 +5,10 @@ class ChangeLiquidTagsToPolymorphic < ActiveRecord::Migration
 
     add_index :spud_page_liquid_tags, [:attachment_type,:attachment_id]
 
-    SpudPageLiquidTag.all.each do |f|
-      f.update_attributes(:attachment_type => "SpudPagePartial")
+    if defined?(SpudPageLiquidTag)
+      SpudPageLiquidTag.all.each do |f|
+        f.update_attributes(:attachment_type => "SpudPagePartial")
+      end
     end
   end
 

data/db/migrate/20140110142037_drop_spud_page_liquid_tags.rb

@@ -0,0 +1,31 @@
+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/engine.rb

@@ -1,7 +1,7 @@
 require 'tb_core'
 require 'tb_permalinks'
 require 'codemirror-rails'
-require 'liquid'
+require 'tb_liquid'
 
 module Spud
   module Cms
@@ -34,20 +34,12 @@ module Spud
         include Spud::Searchable
       end
      end
-    initializer :cms_sweepers do |config|
-      if ActiveRecord::Base.connection.tables.include?('spud_pages')
-        Admin::ApplicationController.instance_eval do
-          cache_sweeper :page_sweeper, :except => [:show,:index]
-        end
-      end
-    end
 
      initializer :spud_cms_routes do |config|
       config.routes_reloader.paths << File.expand_path('../page_route.rb', __FILE__)
      end
 
      initializer :assets do |config|
-    	Rails.application.config.assets.precompile += ["admin/cms*"]
       Spud::Core.append_admin_javascripts('admin/cms/application')
       Spud::Core.append_admin_stylesheets('admin/cms/application')
   	 end

data/lib/spud_cms/page_route.rb

@@ -1,5 +1,3 @@
-Rails.application.routes.append do
-	# constraints :path => /(?!assets)/ do
-		match "*id", :controller => "pages",:action => "show", :as => "page"
-	# end
+Rails.application.routes.draw do
+	match "*id", :controller => "pages", :action => "show", :as => "page", :via => [:get, :post]
 end

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.0.3"
+		VERSION = "1.1.0"
 	end
 end

data/spec/controllers/admin/menu_items_controller_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe Admin::MenuItemsController do
   before(:each) do
-    ActiveRecord::Base.observers.disable(:page_sweeper)
-
     activate_authlogic
     u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
     u.super_admin = true

data/spec/controllers/cms/sitemaps_controller_spec.rb

@@ -3,23 +3,22 @@ require 'spec_helper'
 describe Cms::SitemapsController do
   describe :show do
     before(:each) do
-        Spud::Core.configure do |config|
-          config.site_name = "Test Site"
-          config.multisite_mode_enabled = false
-          config.multisite_config = []
-        end
-
+      Spud::Core.configure do |config|
+        config.site_name = "Test Site"
+        config.multisite_mode_enabled = false
+        config.multisite_config = []
       end
-    it "should return the sitemap urls" do
+    end
 
+    it "should return the sitemap urls" do
       get :show, :format => :xml
-
       assigns(:pages).should == SpudPage.published_pages.public.order(:spud_page_id)
     end
 
     it "should only respond to an XML format" do
-      get :show
-      response.response_code.should == 406
+      expect {
+        get :show
+      }.to raise_exception(ActionController::UnknownFormat)
     end
 
     describe :multisite do
@@ -32,17 +31,12 @@ describe Cms::SitemapsController do
       end
 
       it "should only assign pages for current site" do
-        2.times {|x|  s = FactoryGirl.create(:spud_page)}
-        3.times {|x|  s = FactoryGirl.create(:spud_page,:site_id => 1)}
-
+        2.times {|x| FactoryGirl.create(:spud_page) }
+        3.times {|x| FactoryGirl.create(:spud_page,:site_id => 1) }
         get :show, :format => :xml
-
         assigns(:pages).should == SpudPage.published_pages.public.order(:spud_page_id).site(1)
-
       end
 
     end
   end
-
-
 end