comfortable_mexican_sofa 1.0.30 → 1.0.31

data/.gitignore

@@ -7,4 +7,7 @@ db/schema.rb
 db/development_structure.sql
 public/system/*
 pkg
-rdoc
+rdoc
+/tmp
+public/cms-css/
+public/cms-js/

data/VERSION

@@ -1 +1 @@
-1.0.30
+1.0.31

data/app/controllers/cms_content_controller.rb

@@ -3,7 +3,9 @@ class CmsContentController < ApplicationController
   before_filter :load_cms_site
   before_filter :load_cms_page,   :only => :render_html
   before_filter :load_cms_layout, :only => [:render_css, :render_js]
-    
+  
+  caches_page :render_css, :render_js
+  
   def render_html(status = 200)
     layout = @cms_page.cms_layout.app_layout.blank?? false : @cms_page.cms_layout.app_layout
     render :inline => @cms_page.content, :layout => layout, :status => status

data/app/models/cms_layout.rb

@@ -6,6 +6,10 @@ class CmsLayout < ActiveRecord::Base
   belongs_to :cms_site
   has_many :cms_pages, :dependent => :nullify
   
+  # -- Callbacks ------------------------------------------------------------
+  after_save    :clear_cache, :clear_cached_page_content
+  after_destroy :clear_cache, :clear_cached_page_content
+  
   # -- Validations ----------------------------------------------------------
   validates :cms_site_id,
     :presence   => true
@@ -17,8 +21,7 @@ class CmsLayout < ActiveRecord::Base
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
   validates :content,
     :presence   => true
-    
-  validate :content_tag_presence
+  validate :check_content_tag_presence
     
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for layouts
@@ -98,11 +101,24 @@ class CmsLayout < ActiveRecord::Base
   
 protected
   
-  def content_tag_presence
+  def check_content_tag_presence
     CmsTag.process_content((test_page = CmsPage.new), content)
     if test_page.cms_tags.select{|t| t.class.superclass == CmsBlock}.blank?
       self.errors.add(:content, 'No cms page tags defined')
     end
   end
   
+  # After saving need to make sure that cached pages for css and js for this
+  # layout and its children are gone. Good enough to avoid using cache sweepers.
+  def clear_cache
+    FileUtils.rm File.expand_path("cms-css/#{self.slug}.css", Rails.public_path), :force => true
+    FileUtils.rm File.expand_path("cms-js/#{self.slug}.js",   Rails.public_path), :force => true
+    self.children.each{ |child| child.save! }
+  end
+  
+  # Forcing page content reload. This will happen in cascade due to #clear_cache mathod above.
+  def clear_cached_page_content
+    self.cms_pages.each{ |page| page.save! }
+  end
+  
 end

data/app/models/cms_page.rb

@@ -17,6 +17,7 @@ class CmsPage < ActiveRecord::Base
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_parent,
                     :assign_full_path
+  before_save       :set_cached_content
   after_save        :sync_child_pages
   
   # -- Validations ----------------------------------------------------------
@@ -93,15 +94,19 @@ class CmsPage < ActiveRecord::Base
   
   # Processing content will return rendered content and will populate 
   # self.cms_tags with instances of CmsTag
-  def content
-    self.cms_tags = [] # resetting
-    cms_layout ? CmsTag.process_content(self, cms_layout.merged_content) : ''
+  def content(force_reload = false)
+    @content = read_attribute(:content)
+    @content = nil if force_reload
+    @content ||= begin
+      self.cms_tags = [] # resetting
+      cms_layout ? CmsTag.process_content(self, cms_layout.merged_content) : ''
+    end
   end
   
   # Array of cms_tags for a page. Content generation is called if forced.
   # These also include initialized cms_blocks if present
-  def cms_tags(force = false)
-    self.content if force
+  def cms_tags(force_reload = false)
+    self.content(true) if force_reload
     @cms_tags ||= []
   end
   
@@ -123,6 +128,10 @@ protected
     end
   end
   
+  def set_cached_content
+    write_attribute(:content, self.content(true))
+  end
+  
   # Forcing re-saves for child pages so they can update full_paths
   def sync_child_pages
     children.each{ |p| p.save! } if full_path_changed?

data/app/models/cms_snippet.rb

@@ -3,6 +3,10 @@ class CmsSnippet < ActiveRecord::Base
   # -- Relationships --------------------------------------------------------
   belongs_to :cms_site
   
+  # -- Callbacks ------------------------------------------------------------
+  after_save    :clear_cached_page_content
+  after_destroy :clear_cached_page_content
+  
   # -- Validations ----------------------------------------------------------
   validates :cms_site_id,
     :presence   => true
@@ -51,4 +55,13 @@ class CmsSnippet < ActiveRecord::Base
     nil
   end
   
+protected
+  
+  # Note: This might be slow. We have no idea where the snippet is used, so
+  # gotta reload every single page. Kinda sucks, but might be ok unless there
+  # are hundreds of pages.
+  def clear_cached_page_content
+    CmsPage.all.each{ |page| page.save! }
+  end
+  
 end

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.30"
+  s.version = "1.0.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2010-11-25}
+  s.date = %q{2010-11-29}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/test/fixtures/cms_pages.yml

@@ -8,6 +8,15 @@ default:
   full_path: '/'
   children_count: 1
   position: 0
+  content: |-
+    
+    layout_content_a
+    default_page_text_content_a
+    default_snippet_content
+    default_page_text_content_b
+    layout_content_b
+    default_snippet_content
+    layout_content_c
   
 child:
   cms_site: default
@@ -19,3 +28,10 @@ child:
   full_path: '/child-page'
   children_count: 0
   position: 0
+  content: |-
+    
+    layout_content_a
+    
+    layout_content_b
+    default_snippet_content
+    layout_content_c

data/test/unit/cms_layout_test.rb

@@ -36,6 +36,23 @@ class CmsLayoutTest < ActiveSupport::TestCase
     assert layout.valid?
   end
   
+  def test_creation
+    assert_difference 'CmsLayout.count' do
+      layout = cms_sites(:default).cms_layouts.create(
+        :label    => 'New Layout',
+        :slug     => 'new-layout',
+        :content  => '{{cms:page:content}}',
+        :css      => 'css',
+        :js       => 'js'
+      )
+      assert_equal 'New Layout', layout.label
+      assert_equal 'new-layout', layout.slug
+      assert_equal '{{cms:page:content}}', layout.content
+      assert_equal 'css', layout.css
+      assert_equal 'js', layout.js
+    end
+  end
+  
   def test_options_for_select
     assert_equal ['Default Layout', 'Nested Layout', '. . Child Layout'],
       CmsLayout.options_for_select(cms_sites(:default)).collect{|t| t.first}
@@ -117,4 +134,13 @@ class CmsLayoutTest < ActiveSupport::TestCase
     assert !CmsLayout.load_for_slug(cms_sites(:default), 'not_found')
   end
   
+  def test_update_forces_page_content_reload
+    layout = cms_layouts(:default)
+    page = cms_pages(:default)
+    assert_equal layout, page.cms_layout
+    layout.update_attribute(:content, 'updated {{cms:page:default_page_text:text}} updated')
+    page.reload
+    assert_equal "updated default_page_text_content_a\ndefault_snippet_content\ndefault_page_text_content_b updated", page.content
+  end
+  
 end

data/test/unit/cms_page_test.rb

@@ -5,6 +5,7 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_fixtures_validity
     CmsPage.all.each do |page|
       assert page.valid?, page.errors.full_messages
+      assert_equal page.read_attribute(:content), page.content(true)
     end
   end
   
@@ -189,6 +190,17 @@ class CmsPageTest < ActiveSupport::TestCase
     assert page.cms_blocks_attributes.first[:id]
   end
   
+  def test_content_caching
+    page = cms_pages(:default)
+    assert_equal page.read_attribute(:content), page.content
+    assert_equal page.read_attribute(:content), page.content(true)
+    
+    page.update_attribute(:content, 'changed')
+    assert_equal page.read_attribute(:content), page.content
+    assert_equal page.read_attribute(:content), page.content(true)
+    assert_not_equal 'changed', page.read_attribute(:content)
+  end
+  
 protected
   
   def new_params(options = {})

data/test/unit/cms_snippet_test.rb

@@ -57,4 +57,13 @@ class CmsSnippetTest < ActiveSupport::TestCase
     assert !CmsSnippet.load_for_slug(cms_sites(:default), 'not_found')
   end
   
+  def test_update_forces_page_content_reload
+    snippet = cms_snippets(:default)
+    page = cms_pages(:default)
+    assert_match snippet.content, page.content
+    snippet.update_attribute(:content, 'new_snippet_content')
+    page.reload
+    assert_match /new_snippet_content/, page.content
+  end
+  
 end

data/test/unit/cms_tag_test.rb

@@ -78,7 +78,7 @@ class CmsTagTest < ActiveSupport::TestCase
       layout_content_b
       default_snippet_content
       layout_content_c'
-    ), page.content
+    ), page.content(true)
     
     assert_equal 4, page.cms_tags.size
     assert_equal 'cms_tag/field_text_default_field_text', page.cms_tags[0].identifier
@@ -173,7 +173,7 @@ class CmsTagTest < ActiveSupport::TestCase
       default_page_text_content_a
       default_snippet_content
       default_page_text_content_b'
-    ), page.content
+    ), page.content(true)
     
     assert_equal 6, page.cms_tags.size
     assert_equal 'cms_tag/field_text_default_field_text', page.cms_tags[0].identifier
@@ -199,7 +199,7 @@ class CmsTagTest < ActiveSupport::TestCase
       layout_content_b
       infinite  loop
       layout_content_c'
-    ), page.content
+    ), page.content(true)
     assert_equal 6, page.cms_tags.size
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 1
   - 0
-  - 30
-  version: 1.0.30
+  - 31
+  version: 1.0.31
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 -05:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency