spud_cms 0.9.21 → 1.0.0.RC1

data/app/models/spud_page_liquid_tag.rb

@@ -1,4 +1,3 @@
 class SpudPageLiquidTag < ActiveRecord::Base
-  attr_accessible :attachment_type,:attachment_id, :tag_name, :value
-  belongs_to :attachment, :polymorphic => true
+  belongs_to :attachment, :polymorphic => true, :touch => true
 end

data/app/models/spud_page_partial.rb

@@ -1,8 +1,7 @@
 class SpudPagePartial < ActiveRecord::Base
-	belongs_to :spud_page
+	belongs_to :spud_page, :touch => true
 	has_many :spud_page_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
@@ -18,15 +17,22 @@ class SpudPagePartial < ActiveRecord::Base
 	end
 
 	def postprocess_content
-		template = Liquid::Template.parse(self.content) # Parses and compiles the template
+		rendererClass = Spud::Core.renderer(self.format)
+		if rendererClass
+			renderer = rendererClass.new()
+			self.content_processed = renderer.render self.content
+		else
+			self.content_processed = content
+		end
+		# template = Liquid::Template.parse(self.content) # Parses and compiles the template
 
-		self.content_processed = template.render('page' => self.spud_page)
+		# 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|
+		self.spud_page_liquid_tags.each do |tag|
 			tag.destroy
 		end
 		template.root.nodelist.each do |node|
@@ -44,7 +50,9 @@ class SpudPagePartial < ActiveRecord::Base
 		if read_attribute(:content_processed).blank?
 			self.update_column(:content_processed, postprocess_content)
 		end
-		return read_attribute(:content_processed)
+		template = Liquid::Template.parse(read_attribute(:content_processed)) # Parses and compiles the template
+
+		return template.render('page' => self.spud_page)
 	end
 
 	def maintain_revisions

data/app/models/spud_page_partial_revision.rb

@@ -1,8 +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
   scope :for_partial, lambda {|partial| where(:spud_page_id => partial.spud_page_id, :name => partial.name)}
-
 end

data/app/models/spud_snippet.rb

@@ -1,5 +1,4 @@
 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
@@ -9,11 +8,19 @@ class SpudSnippet < ActiveRecord::Base
 
   before_save :postprocess_content
   after_save :update_taglist
+  after_destroy :expire_cache
+
   def postprocess_content
-    template = Liquid::Template.parse(self.content) # Parses and compiles the template
-    self.content_processed = template.render()
+    rendererClass = Spud::Core.renderer(self.format)
+    if rendererClass
+      renderer = rendererClass.new()
+      self.content_processed = renderer.render self.content
+    else
+      self.content_processed = content
+    end
   end
 
+
   def content_processed=(content)
     write_attribute(:content_processed,content)
   end
@@ -22,7 +29,8 @@ class SpudSnippet < ActiveRecord::Base
     if read_attribute(:content_processed).blank?
       self.update_column(:content_processed, postprocess_content)
     end
-    return read_attribute(:content_processed)
+    template = Liquid::Template.parse(read_attribute(:content_processed)) # Parses and compiles the template
+    return template.render()
   end
 
 
@@ -37,6 +45,16 @@ class SpudSnippet < ActiveRecord::Base
         self.spud_page_liquid_tags.create(:tag_name => node.tag_name,:value => node.tag_value)
       end
     end
+
   end
 
+  def expire_cache
+    # Now Time to Update Parent Entries
+    old_name = self.name_was
+    values = [self.name]
+    values << old_name if !old_name.blank?
+    SpudPageLiquidTag.where(:tag_name => "snippet",:value => values).includes(:attachment).each do |tag|
+      partial = tag.touch
+    end
+  end
 end

data/app/observers/page_sweeper.rb

@@ -1,3 +1,5 @@
+require 'actionpack/action_caching'
+require 'actionpack/page_caching'
 class PageSweeper < ActionController::Caching::Sweeper
   observe :spud_page,:spud_menu_item
 

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

@@ -14,11 +14,16 @@
 	<%=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%>
+		<%cache page_partial do%>
+			<%=page_partial.content_processed.html_safe%>
+		<%end%>
 	<%else%>
 		<%=content_for page_partial.symbol_name.to_sym do%>
-			<%=page_partial.content_processed.html_safe%>
+			<%cache page_partial do%>
+				<%=page_partial.content_processed.html_safe%>
+			<%end%>
 		<%end%>
 	<%end%>
 <%end%>

data/app/views/spud/admin/menu_items/_form.html.erb

@@ -5,22 +5,15 @@
 	<div class="controls">
 		<%=f.text_field :name,:title => "",:size=>40%>
 	</div>
-  
-</div>
-<div class="control-group">
 
-	<%=f.label :menu_order, :required=>true,:class => "control-label"%>
-	<div class="controls">
-	  <%=f.text_field :menu_order,:title => "",:size=>5%>
-	</div>
-  
 </div>
+
 <div class="control-group">
 	<%=f.label :spud_page_id, "Page",:class => "control-label"%>
 	<div class="controls">
 	    <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:site_id => session[:admin_site]),@menu_item.spud_page_id),{:include_blank => 'Use URL instead'},{:title => "",:onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
 	</div>
-  
+
 </div>
 
 
@@ -42,7 +35,7 @@
 	<div class="controls">
 		<%=f.select :parent_id,options_for_select(SpudMenuItem.options_tree_for_item(@menu,:filter => @menu_item),@menu_item.parent_type == 'SpudMenuItem' ? @menu_item.parent_id : nil),{:include_blank => "#{@menu.name}"},{:title => ""}%>
 	</div>
-  
+
 </div>
 
 </fieldset>

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

@@ -1,8 +1,8 @@
-<div class="page_row" menu_item_id="<%=menu_item.id%>">
+<div class="page_row menu-item-row" data-menu-item-id="<%=menu_item.id%>">
 
 	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to menu_item.name,edit_spud_admin_menu_menu_item_path(:id => menu_item.id)%></span>
 
-	<span class="edit_controls"><%=link_to "Edit",edit_spud_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",spud_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_spud_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn btn-small'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'btn btn-small 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">

data/app/views/spud/admin/menu_items/index.html.erb

@@ -2,6 +2,7 @@
 <%=link_to "New Menu Item",new_spud_admin_menu_menu_item_path(),:class => "btn btn-primary",:title => "New Menu Item"%>
 <%end%>
 <%=content_for :detail do%>
+<p class="lead">Drag and drop to rearrange your menus.</p>
 	<ul id="root_menu_list" class="menu_list page_list sortable connectedSortable">
 			<%@menu_items.each do |menu_item|%>
         <li>
@@ -11,7 +12,8 @@
 
 	</ul>
 
+
 <script type="text/javascript">
-$(document).ready(function() { spud.admin.cms.menu_items.init();})
+$(document).ready(function() { spud.admin.cms.menu_items.init(<%=@menu.id%>);})
 </script>
 <%end%>

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

@@ -14,7 +14,14 @@
 	<%=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 => "tinymce"%>
+      <div class="control-group">
+        <div class="controls">
+          <%=b.select :format,Spud::Core.renderers.collect { |k,v| [v[:description] || k, k]}, {:include_blank => false}, :class => "pull-right", "data-formatter" => "spud_partial_#{b.object.name.parameterize}"%>
+        </div>
+      </div>
+      <div style="clear:both;">
+  			<%=b.text_area :content,:class => "spud-formatted-editor", :rows => 10, :id => "spud_partial_#{b.object.name.parameterize}","data-format" => b.object.format%>
+      </div>
 		</div>
 	<%end%>
 </div>

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

@@ -4,17 +4,19 @@
 
 	  <meta name="keywords" content="<%=@page.meta_keywords%>" />
 <%end%>
-
-<%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%>
+<%cache @page do%>
+	<%if !@inline.blank?%>
+		<%=render :inline => @inline%>
+	<%end%>
+	<%@page.spud_page_partials.each do |page_partial|%>
+		<%cache page_partial do%>
+			<%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%>
 		<%end%>
 	<%end%>
 <%end%>

data/app/views/spud/admin/snippets/_form.html.erb

@@ -4,5 +4,12 @@
 </fieldset>
 <br/>
 <div>
-  <%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width' %>
+  <div class="control-group">
+	  <div class="controls">
+	    <%=f.select :format,Spud::Core.renderers.collect { |k,v| [v[:description] || k, k]}, {:include_blank => false}, :class => "pull-right", "data-formatter" => "spud_snippet_content_area"%>
+	  </div>
+	</div>
+	<div style="clear:both;">
+	  <%= f.text_area :content,:style => "width:100%;", :id => "spud_snippet_content_area", :class => 'spud-formatted-editor full-width',"data-format" => f.object.format %>
+	</div>
 </div>

data/config/routes.rb

@@ -12,7 +12,9 @@ Rails.application.routes.draw do
          resources :snippets
 
    		resources :menus do
-   			resources :menu_items
+   			resources :menu_items do
+          put :sort, :on => :collection
+        end
    		end
    		resources :contacts
    	end
@@ -20,7 +22,10 @@ Rails.application.routes.draw do
          resource :sitemap,:only => "show"
       end
    end
-   root :to => 'pages#show'
+
+   if Spud::Cms.config.root_page_name
+     root :to => 'pages#show'
+   end
 
    # 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"

data/lib/spud_cms/engine.rb

@@ -2,7 +2,8 @@ require 'spud_core'
 require 'spud_permalinks'
 require 'codemirror-rails'
 require 'liquid'
-
+require 'rails/observers/activerecord/active_record'
+require 'rails/observers/action_controller/caching/sweeping'
 module Spud
   module Cms
     class Engine < Rails::Engine
@@ -34,13 +35,15 @@ module Spud
         include Spud::Searchable
       end
      end
-    initializer :cms_sweepers do |config|
-      if ActiveRecord::Base.connection.tables.include?('spud_pages')
-        Spud::Admin::ApplicationController.instance_eval do
-          cache_sweeper :page_sweeper, :except => [:show,:index]
-        end
-      end
-    end
+    # initializer :cms_sweepers do |config|
+
+    #   ActionController::Base.extend ActionController::Caching::Sweeping::ClassMethods
+    #   if ActiveRecord::Base.connection.tables.include?('spud_pages')
+    #     Spud::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__)

data/lib/spud_cms/liquid_taggable.rb

@@ -0,0 +1,28 @@
+module Spud::LiquidTaggable
+	extend ActiveSupport::Concern
+	included do
+		extend ClassMethods
+	end
+	module ClassMethods
+		def liquid_taggable(options)
+			@liquid_tag_name = options[:tag_name]
+			@liquid_tag_id_field = options[:tag_id_field] || :name
+		  after_save :expire_cache
+		  after_destroy :expire_cache
+		end
+	end
+
+  def expire_cache
+    # Now Time to Update Parent Entries
+    old_name = self.name_was
+    values = [self.name]
+    values << old_name if !old_name.blank?
+    SpudPageLiquidTag.where(:tag_name => "snippet",:value => values).includes(:attachment).each do |tag|
+      partial = tag.touch
+    end
+  end
+
+  def tag_name
+    	self.superclass.instance_variable_get('@liquid_tag_name')
+	end
+end

data/lib/spud_cms/page_route.rb

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

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "0.9.21"
+		VERSION = "1.0.0.RC1"
 	end
 end

data/spec/controllers/pages_controller_spec.rb

@@ -84,8 +84,11 @@ describe PagesController do
 
         it "should not show a page on a different site" do
           page = FactoryGirl.create(:spud_page,:name => "about",:site_id => 0)
-          get :show,:id=>"about"
-          response.response_code.should == 404
+          expect {
+            get :show,:id=>"about"
+          }.to raise_exception(ActionController::RoutingError)
+
+          # response.response_code.should == 404
         end
 
         it "should show the right page" do

data/spec/controllers/spud/cms/sitemaps_controller_spec.rb

@@ -18,8 +18,9 @@ describe Spud::Cms::SitemapsController do
     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

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

@@ -6,8 +6,6 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -22,8 +20,7 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
@@ -32,6 +29,7 @@ Dummy::Application.configure do
   # Do not compress assets
   config.assets.compress = false
 
+  config.eager_load = false
   # Expands the lines which load the assets
   config.assets.debug = true
 end

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

@@ -60,7 +60,7 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
+  config.eager_load = true
   # 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